Refactored project structure a bit