Moved things around a bit. Mainly occupied with cleaning CORS the shortest possible.