started refactoring into multiple modules