More developer friendly directory structure