Added spinner delay and renamed a few more files