Initial commit contd.

- improve the import path to follow go convention