Moved application directory down one level, and fixed analytics code