Adjusting name spaces
Moving files