changed folder-structur