restructured libraries
Merge pull request #7 from NPTricky/feature-restructure_project

Restructured libraries. For real, this time.