move to package structure. closes #5