Renamed a lot of stuff and moved some assets around.