changed some formatting and folder names