Organize initial source structure