Regrouped lib files in lib dir, and corrected null case on setName() func