Rearranged debris to be a bit more logical
Fixed compilation on Linux