Make library more flat