Separation of JS files (WIP)