Moving Classes to lib folder