Fixed up some wrong macros
Added project skeleton