Add ETS master server to supervisor

Add a worker to top supervisor and change macros to better versions
suitable for workers and sups...