reorganized code directory structure a bit