Few fixes of configuration variables
Reorganized apps directory