moved some classes in different packages refactored some variables declarations