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