Revert "One more import fix"

This reverts commit 02ce9079588d45ef6e4f72b7d950a213a6b30eb0.
Revert "Fixed imports/package declerations"

This reverts commit 680dac3437fbc97ea9dcc51494fe637703bbcc04.
Merge branch 'master' of https://github.com/cwallet/coinwallet