Remove unused file, reorganize folders