Moved files into subdirectories. Tweaked buildsite to handle that.