Fixing importers
Fixing imprters with clean up logic
Merge branch 'master' of github.com:usmanm/goodplates