Bunch of refactoring of the schema;
Changed Commutetypes to CommuteTypes;
Added delagtes where appropriate;
Removed some unnecessary join tables;

Warning: Migration not be 100%.  So you might have to drop your DB and start from scratch;