Files renamed

Main files renamed for coherence with folder name