finish moving theme and custom layout into admin namespace