restructuring the business logic
changed namespaces fmbo better project structure
merge conflicts resolved