New Structure of project, completely disabled the old code.