Address Chris' comments, with the exception of the resource restructuring and determining the base directory.