renamed and restructured directory tree