Move into folder for convenience
Admin page repopulation
Promote fixes and error handling