update project structure to simplify build. Update bean definition file to simplify test driven development.
Merge branch 'master' of https://github.com/sala223/DelicacyFusion