relocated files according to ext request
Initial Refactoring
Refactoring code