Cleanup post 2.0

Some minor filename and directory changes.