changed package structure slightly