Renamed some files to more logical names, removed unused files