Modules structure complete
Merging to Master
categories main page