Reorganize current group

Changes current per #41 and closes #41.