re-organized files and folders