* Removed Unused Usings * Code Refactoring for readbility. Added spaces and moved the classes to separate file