Reorganised dir tree, user normaly fixed, no bugtest tough