moving code into src dir