Refactored project structure. Renaming.