Reorganize application