changed Layout and removed project class