Reorganise Profile base/mixin classes