Rename files to comply with current standard
Removing duplicated templates
Bug fixing on imports