Dir structure changes

 Made the necessary changes to be in sync with the directory and library
    structure changes in buteo-syncfw