Improve tracing
Changed folder structure