Rearragned files to work with GAE