minor changes on folder structure