Moved helper files into their own directory