Changed directory structure, moved files to the root directory