updated and cleaned up folder