Started changing map loading code to handle platform colours
Some minor fixes such as cleaning up uncessessary variables
Started removing old platform hacks
Reordered map-loading files into new package.