Simplifying libraries
Simplifying libraries
Merge pull request #1 from tophertech/master

Changing the modules around