[code_reorg] Reorg files and Making build with GCC

Should probably  split into two commits, but oh well.
[bug_fix] Removing annoying Message calls