Restructure to allow better integration with the UMA Power Pack