Modified: improved package structure.
Merge pull request #4 from futoase/improve

I going of merge after testing.