Add back in classes dir and rebuild