moved some stuff around
added some __init__.py files