refactored NumberWithLabelElement to a single constructor with java.lang.Number as argument
refactoring of package names for consistency