Changed structure to account for libraries