changed test folder package names
integrated calendar pane into main ui