Re-orgainsed the file structure ready for it to be turned into a ruby gem