Removed WAP Push and Restructured files