Restructs sample
Specify module name in exception message
Remove unused dependencies from pom