Decoupled the useless file extensions from rest of the code