Removed unnecessary directories
Added one more task to basic refactorings