Reorganize file structure for my sanity