restructure exisiting codes in Admin