Reorganized file structure a bit.