rewrite project to match mr.bob file structure