fixes in dependency and structure