Re-working the directory structure and naming