Initial organization update

Moved JS externally