Folder strcuture reorganized