Move things around to make it easier to import to webapp