changes to package structure to make tests work