#6169 fixing type references in SpEl
#6169 TimePeriod field layout improvements
refactoring package structure