Move all source files into the proper subfolders
Move more functions into the util namespace