Minor project restructure.
Minor project restructure.