Moved code in src directory