Bug fixes
Renamed stuff
Added bunch of missing files
Heaps of changes so that things compile again.