Refactored the application package structure.
Spelling.