Reverted all sources moved to GWTP-59 branch