Restructured folder for future readability