Refactored names; allow source deletion
Removed old files