Restructure gadmin. Resolves #245