Restructure tracker modules