Classes moved to lib dir, tests are running