Updating packages and reorganizing project layout.