removed useless classes
simplified packages