A bunch of structural changes
Added habit class