Moved some common files around and added jQuery2