Cleanup webapp structures and fix setup.py to handle both packages