Update for clarity and new directory