-Emf SingleBuilder Template added
-Regex Seperated Template added
-Tests re-organized