Renaming and rearranging per feedback on #25