Moved everything to directories and subdirectories