added subdirectory structure