Refactored project to have multiple modules.
Added database and datastore modules