Moved filestructure. Tables filled from data