Changed folder names to better descriptive names