move code to src dir
little cleanup