Changed structure, added files and dirs