2014.10.19 - Reorganize JS