Remove some unnecessary directory nesting
Another de-nesting
Clean up public JS directory structure