refactor classes to packages
remove old files