Remove and organizing of unnecessary proprietary file