Implement $registrydisks deployment variable
Move some things around to hopefully improve dependency handling