added more folder organization