restructure of packages and classes