cleaned up directory structure...modulate js classes