Made directory naming consistent, trying to use snake_case for everything