Updated architecture to follow three tier;
Merged all conflicting files