Simplify.

The folders were driving me crazy. Removed stuff I don't use. Etc, Etc.