initial structure and classes removed.