Incapsulate entities in models folder
Log correct batch number