Working on new rendering, removed & moved some files