Fixing code organation issue.