Changed directory structure to work better in the future