restructure for core 0.6.0