JR: moved all files accross from HTML5