change project structure - prepare for modularity