Refactored project structure
Project refactoring Part II (and last, I guess)