Moved core files to controller/common