Revert "folder restructure"

This reverts commit d70cec1dc351d95684009638d6c486f6e57e705f.
add box2d