[PR] Additional code organization and admin header corrections