Added a method for aggregating by month or week.
Cleaned up files.