removed class files - will put new ones later
changed package names