Fixed white move dividers
Refactored lib path for consistancy