renamed main folders for clarity