Move all strings to xml resource
Cleanup storage classes
Cleanup imports
Merge pull request #4 from jianC/master

General Cleanup