Separation of App and CI System

Improved separation of the app and CI system files, this makes it much
easier to update the CI system and then mod of the app core