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