Changing file structure a little.