Change file structure, remove app directory