Build #27

Refactoring, Log-Changes, Package Names