restructuring directory layout: remaining components