Restructuring JS
Finished restructuring
Merge pull request #3 from v3rm0n/restructure

Restructure