split out the features into more modules.
split out features.
removed empty features inc file
Renamed some fields. Probably not a good idea.