Code organization changes