Moving App files into their own dir