file structure a little bit simpler