Change project stucture, again..