Unnecessary files deleted and naming corrections