Put free time code into a better organization