Moved everything to master branch and flattened generator