* restructured directory to make sourcing easier