Sorted into folders :P and added the Graph class