started structuring for v1.0