refactor to get it to work, fixed up fence's meta-ing ability

sorry if I shuffled the filesystem around a bit, but its the only way I got it to work under eclipse