Changed directory structure and added Firefox non-standard support