Begin mirgrating features

Began clean up of code to moving features around for more stable
installation of depenant files.