Refactored project structure and names.