1.0.0.0

Consolidated changes and removed duplicate files