Moved dwarf classes to their own package
Testing