Added Category Model and related Specs
Refactored Company and Country Specs