re-jig feature file folder structure, pull in spring