Fixes few issues, update directory structure and data files