Clean up features for proper file handling

Features will need to be handled structurally within output files.