Restructure in preparation for 'cannon' and customs and nerfs