Reorganize a little, put spec files next to src files