overhauled the directory structure