Redid package structure to allow for testing
Added bloch processing