Cleaning things up by adding different folders