Reorganize projects structure
Add code fix for "unused local variable" compiler warning

Work in progress,  bugs are still lurking