Finished limited version of application
reorg