more clean up, naming (move Wobly next to other wobblies)