Code clean up, moved some files to make the new admin structure work