Add setup/ directory, make test/ structure consistent
Update relative paths with new directory structure
Update README with new directory structure