organize changes for aem better