moved some files to src/scene and src/utils, plus some minor changes