Modify dependencies to com.sun and Following startup conventions