Refactored to work from App folder as root