moved classes to libraries directory