Undo compiler merge
Move code back out of lib subdir
Fix pathing for test files