Moved STPs back to own folder