Split classes into lib dir