changed package structure. added some info