restructure for pythonic deployment