Move non-libraries out of lib