Reorganize and require higher version of combustion
Set up db with rake before running