Reorganization of package, addition of basic test data and basic tests.