Reorganized files and prepared some to be deleted