changed directory structure and added necessary packages to requirements