Re-organize prior to first release