Renamed files, cleaned up code