Restructured lib hierarchy & updated cinderblock xml template.