calendar date format fix
Calendar bugfix
File sructure cleanup