Creating proper structure, clean-up and url mapping updates.