Issue #1 Fixing import statements to match guidelines