Moved files around to get closer to a python package structure