Project layout modified to be more convenient.