preparation for #12
updated file structure