Multifile support & more refactoring
End game