Move generators to top level folder
Use generator to scaffold out