moved classes into structured packages