clean up folder structure, clean up page