Reorganization, casperjs integration