Moving Code to correct locations