Moved packages around and added support for Dates using Local Date object of Joda DateTime