Add folder modules including subfolder common