Moved code to a separated dir