Re organize file