added module skeletons, buildup of collections