Moved files to folder

Requirements 2