Fixed up library structure