Moved around some core files