Classes moved to lib folder