Created utils package and moved classes to them