Fix BUG
Clean-up duplicate files
Client JavaScript rewrite (Part. Program)