Added some stuff for js, and moved dir's about a bit