Renaming to keep Arduino happy.
Updated with better structuring