change from libraries to hierarchical module namespace