Range test code

Added code to test range and a little reorganisation of the directory
structure