Organise and move more lines to common