Add of base folders architecture