Update: restructured
Update: clean up