Revert "Re-organize fiels"

This reverts commit 00bd84e8468c691a152c5c4f54a5029b911a9aab.