Move Classes into lib directory