Add REQUIRE; cleanup
Add requires for Calendar package