Moving packages for java inside components-content, refactoring date for use am-pm