Added new packages and moved util classes into their new packages