simplified internal organization in several modules