re-organize folders for features spec
Cleaning up redudant files.