Some project refactoring