Re organized file/folder structure