Restructured the files. Added iPad support