Directory restructring
Preprocess module cleaned up
Added convenient preprocess script
Added another convenient preprocess script
Merge remote-tracking branch 'upstream/master'