Moved some files around, sorted commit history