Moved simulation and util classes to proper folders