Documentation + file simplication