changed basic folder structure