Moved code to source directory