Fix admin template to make sense in the context of the project
Major project restructure