Started re-organizing and debugging defined words dictionary