Renamed a bunch of stuff, also came up with the folder structure for things going forward