Reorganized, removed unused stuff