Updated directory structure, updated dependencies