Hanh Le - Recontruct to lib directory