Merged helper classes back into the main file.