reorganized files, added __init__ files