Re-organized and added more data

Related discussions in issue #15