Moved the sub settings tabs to a new package to reduce clutter