Restructure source tree

This is in preparation for packaging as well as to clean up some legacy naming