Revert "Rearange files"

This reverts commit ec837cd65f0de03e910dad4daa672a4cee47ea65.