Complete Rebuild

Better organization