Change directory structure, add new simulation