Set of code organization changes