Change package structure, adding util and constants class