Added & refactored into standards folders