Finished all tests, cleaned up folder organization