Proprietary files and extract files fixed

Proprietary files still needs some cleanup...