moved files around to fit new structure

merged black scholes tests
removed files with duplicated functionality
You're right. I hadn't thought of that. I'll remove it.