Moved away from library structure.