Restructing helper dir