Complete gimmick skeletons

Also did some organization as usual.