Change folder structure to be a proper python package