re factor the directory hiearachy