Restructuring issue list, closes #1