Overhauled directory structure thingy