Stop adding features.
Make packages as best you can, such that, If you really want something added on, it's a separate package to add on.