Improving file/package structure