Reorganized more files (bs2 into a bs2 folder)