Organizing, added extra customization
Revert "Organizing, added extra customization"

This reverts commit d751464d9ba149af6b92e80f614c028620b7c7b8.