a bit better file structure