Removing utilities folder and moving its content to src