Re-arrange files and add more Foundation extensions