Placed files in respective folders to tidy things up.