Updated project layout to hopefully work with readthedocs better