Rearranged folder setup to prepare for adding tests