Added _ to prefix/suffix files
Removed old duplicate js file (breaking the final build)
Housekeeping/rebuild