Minor update

- Fixed some issues in OS X.
- Organized QML and C++ code