Add folders for better structure