Created separate lib folder for litmus and cleaned up code