Libraries moved to top level