Moved code into an src directory