Moved some files around and cleand up links