Fixed some formatting and folders