Code refining and add a feature to move sites