Debugging restructure