Moved some Files to restructure the output functions