Merge changes from bboe.
Add data. Create separate directory for data