Refactored project structure into multiple modules
Reformat according to Code Style - 4 spaces indent, no tabs