Map update + some cleaning

Put maplayers and cleaned some things away. Also preprosessor fix for
Input system.