Refactoring...
Removed redundant files