rename folders and functions for better readability