better directory structure for niagara