reorganizing files
fixing merge conflicts with file reorganization