use a flatter folder structure