delete unnecessary files, rename and refactory classes