Fixed up make includes.
Replaced application callbacks with new app macro.
Replaced code with new macro.
Added missing macros.
Removed unneccessary module.