* moved interfaces into separate package
* formating