Refactoring

Refactoring completed
Merging Refactoring and master branches