reorganized package structure to be more compact
whoopsie did not still need that