Refactored project structure somewhat.