Further decompose the functions file
Update browser tests and gruntfile src order