Renamed some files, removed some obsolete