Changed Porject Structure