Reorged files to match naming conventions