Added components folders for more structure