Added Caps to most folders and fixed a few things