Cleaned up the folder structure,
  since having everything in one folder was getting messy.