Refactoring

Some classses were moved to reorganize packages.
Deleted some not used methods and deprecated classes.