Changed parameter names to make content more clear
added class und package structure