moved classes to histogram folder; failing stubs for integration tests