Project refactoring for tutorial