Moved js to own file
Restructuring