fixing file layout changes since basing on fgrehm/devstep