reorganizing structure
reorganizing the package
consolidated interface