Update Directories

Updated the way that some of the directories worked for some of the
included libraries