removed expressdecode dependency
changes to file structure