Refactoring

Removed and Sorted all using's for all classes