Fixed or removed some package/subpackage definitions to reflect directory structure

Lowercase cake instead of Cake
Tests instead of Test
Fixtures instead of Fixture
Merge pull request #1312 from ravage84/package-fixes

Fixed or removed some package/subpackage definitions to reflect director...