Project compiling after big refactoring