Added temporary moduralized structure.