Adjusted package structure (moved generic classes into util package)