Revert "cleaning up file structure"

This reverts commit c116813ba2bf0c34ba8becc3e08d9afd9f578ed2.