Project refactor