Renamed files and fixed stuff up