refactored, put dictionary into distinct files