Re-org components to be similar to gh-pages
Add normalize to clank