Restructured file tree. Again. I am indecisive.