Fixing paths
Adding Application for top level context