Changed file structure a bit.