use better directory structure