Changed structure and updated files