working version
updated file structure