Moved some data object files around for better folder organization.
Moved the features folder out of the support directory because it doesn't belong there.