Fixed the layout so it can be used as a python package