Some renaming :ok_hand:

Better organized now