Move drawers to new package and broke encapsulation even more so they'd work