Organized source; fixes #96