restructure all the jawns

fixes #3