Updated library structure of BS