Moved code into src directory