Updates repo folder structure and fixes a namepace issue.
Updates readme.
Fast Forward