MASSIVE reorg to fit gradle standard file convention.  App now builds with gradle