Revert "Added SPA Template"

This reverts commit 42e553e19bed767f68892f806202ae6c58f6e055.
Added Missing Changes