restructured analyser project