Added package directories, make files and any patches from changes to make_final in the previous commit.