Moved files to their appropriate locations the refactorered buttons