Updating .plan
Updating webpage
Minor file reorganization