Architecture Fix

Fix on class names and other misc