Moved Calendar to bizdays and renamed some methods