Reorganized Commands and EventHandlers under Scripts folders