Refactored, changed project structure.