Merging some of spearmint-lite and spearmint to unify codebase