Move core* to core/