Changed file structure slightly.