Code organization changed