renaming app directory
fixing import statements