Removed unused imports
Changed folder name to use app_name