moved some functions out

there were functions that were part of another dll and code was moved
back to its proper location