rearrange admin templates into folder. some imporvements