Many Changes

Just reorganizing