restructured directory to be less stupid