Move feature support to build src
Split features of acceptance test
Merge branch for issue #81