Changed package structure - moved development code from test to develop