fix problem from last commit
start making reader/writer actually use package structure