Clean up file/folder structure