Refactor. Change package structure. Remove unused classes.