moved relevant classes into layout package