Started changing the file structure to make packages behave nicely.
More file structure shenanigans.
Added __init__.py files to make folders into packages.