Cleanup and no more bootstrap
new files for refactoring