Changed entire solution organization