Reorganized files. The previous one was buggy.