Moving stuff to the right places

Signed-off-by: chuljin <github@chuljin.com>