Improved RAE
Modularized query decomposition
Moved files