Moving code into src directory