--Major restructure of analyzer directory