improved includes folder structure