Revert "rarrange file structure"

This reverts commit 8709ae5f30431e573da33fd146131c57eafd0e04.