Initial change of project Structure