Project structure refactored. Fix.