Refactored the structure.
Merged pending changes with the new categories.