reorganized files to make the tree cleaner