fleshing out folder structure in preparation of breaking up the main namespace