change file structure
add debug information