Updated various configs and did some major restructurizations...