added hand instrument, refactored package names