integrated bug fix for the dependancies and refactored file system