Reordering files and implementing namespace sent by odiego