started changing directory structure;