issue #192 - Modernize project structure and organization