Fixing file structure from sample app copypasta