Feature/redesigned structure