Moved macros to another file
Moved dock widget initialization to separate files