changed package structure again