Choline data got, and directory structure fixed up to be a little nicer