cleanup + modules
Merge pull request #2 from CarbonDevXperia/master

cleanup + modules