rename level1 and 2 modules, moved stuff in __init__.py