OA28: Relocated features to modules directory