Stop tracking database.
Reorganize, add brands.
Singularize modules and controllers, for consistancy.
Fumbling around in the dark.