cleaned up files, and placed all into one file
Cleaned up imports in file
Merge pull request #1 from mattludwigs/feature_file-clean-up

Feature file clean up