Merge pull request from intelligenzia/refactoring/project-cleanup Refactoring/project cleanup