Refactor: adapt package names to general java convention (remove camelCase)