Clean up and reorganization to updated file structure