Added new diretory structure