moving to shared libs; removed empty classes