More cleanup- moved Sails constructor to its own module