Consistent variable/mixin/function naming scheme.
Complete reorg and cleanup