Rename

* Renamed Repository
* Renamed Namespaces
* Re-factored code