Moved default controllers to Core area