Modify the import path of some packages
Merge branch 'master' of https://github.com/greivinlopez/citizens