mass lib improvements, renaming and directories structure changes