improved and simplified __init__ files (they import most things now)