Updating formatting to break features into packages