Moved files and templates concept to later