minor refactor
updated file structure
updated version