flattened directory structure & updated deps