Fix some tool stuff + Organization