New directory structure to make the repo "berkable"