Added preliminaries for project restructuring.