Eugene
Project refactoring