Definitely separating your work and home. Best case is a completely different locations for each, worst case you can change up the lighting and/or go to a different corner of your living space. Try to find a place other than the crowded library or other typical big study spaces. "Insert major here" social areas are good, typically the mood matches the assignments and its not a bad thing for somebody in the same class to see what you're doing to come up and see if you want to work together. Pick two or three days to be your two-ish hour work periods, and frame them around food or something else you can trick your brain with. When you get there, eat a snack you like and start working. After your work time, go take lunch or dinner or whatever