Organize files

change some files' location