Finally stable again. Moved many files around. Not sure what was lost.