Changed basic directory structure