changes

*completely renamed packages
*removed unused methods, variables