Further project refactoring