small refactoring, cleaned up project structure