* Removed unneeded dependencies
* Added some application layers in preparation for a datasource