Added missing files
separated code