changing the file structure a little bit.