Update Modules to fit new Architecture
Add Category.java