Move everything 'infrastructure' to an Infrastructure namespace. And make deptrac working again (#204 (closed))