CHANGE: refactored project architecture.