Project refactoring v1.0 complete