Refactoring
Cleaned obsolete files