Added base library structure