Structure code a little better (split out JS, etc)