changing file structure a bit