Rearranged files
Clean up