Reorganices code