Framework migration

Removed old framework and migrated methods (now included in .dll)