moved files to a better directory structure