Restructured the skeletal structure
Reconciled skeletal structure with what was brought in from @dstavis branch.

Merge branch 'master' of https://github.com/dstavis/medi

Conflicts:
	Rakefile
	source/Rakefile
	source/db/source.db
	source/spec/Rakefile