Clean up & reorganize files