UNSTABLE re-factoring WeaveAnalystServices for better MVC (folder
hierarchy changed)