Reorganized file structure by moving files