Added different folder structure