Renames imports as well, relocates tests and adds __init__ where applicable