refactoring and added support for bootstrap in the project