adjust the dir structure; add src files