Changed some folder structure and file naming