* clean up and refactor some files
Merge branch 'master' of github.com:maluramichael/NebulaFramework