[MapEditor] Removed some duplicate classes and added some fixes.