Move to accomodate Python package structure