Reorganized and reads files now