Reorg and delete some stuff
Changes
Allow generation with forman