Expansion and restructure
More categories
Rewrote oneliners to be 100% compliant without "exceptions"