Move into packages and add setup.py
Small generation fixes