Added some folders for better structure