cleaned up libs

moved calendar.data dll into models for main dll, flattened folder
stack, bug fixes