overhauled directory structure