moved files around to fit new structure

merged black scholes tests
removed files with duplicated functionality
Yeah - exactly. I _think_ that should minimise the chance of duplication.