Refactored week and day into their own package, and removed old files