better structure

- separate JS scripts calls
- new includes