Code reorganization, librarification