Fix crosshair positioning bug and revert back to site structure clean up changes

This reverts commit 2ffb4e4670642fc7c7ba01351bedd256025bb918.