Package name fixed
Correct library layout