unify the buildouts with and without vagrant
rename omelette to packages and remove duplicate path's