Reorganize js directory and add js to grunt