cleaned up Tupfile structure