Refactory before the big fight
Repaired library directory