Added New Folders & Layout