total architecture rework
Merge pull request #4 from digitxp/ng

total architecture rework