Added debug macros. Changed project structure