Restructured library
Removed unused import of sys
Merge pull request #5 from mdxs/restructure

Restructured library