removed static classes
removed intermediate Classloader
added hamcrest dependncy