Refactoring
Deleted files to other packages