Refactoring: moved composite glyph classes to composite package