Fixes #1 split cs module and gui app