changed package structure
conflicts resolved