Little bit of file / folder restructering.