Added files ending with numbers
General clean up