Apply refactoring and add unit tests
Add links for startup