Created some order in messy files