restructure the directory structure so that we can have directories per