Move files for cleaner directory structure