Final merge

Nice file names and all split up and tested