4.1: Moving the re-done sampler and collision detector with kiril's notes and cpp files
4.1: moving some shit to cpp