Changed library structure