Updated to new directory structure