Further refactoring and renaming

This removes FeatureMapping and FeatureExpecation classes and just replaces them with the arrays they are. It also folds other pieces of code together.