cabalized and nixed
refactored
removed old file