Used underscores in main package name rather than hyphens + corrected imports