Renamed things, removed pointless files