Fix/gui

Please review @mkurek.
Module name is independent at dir structer.