UNO: Created better files. Will also create a test folder.