minor changes of folder structure