Got inventory working on new directory structure