move classes under lib dir