Reorganized the project modules to build the site in a cleaner manner

Change-Id: I5134414391b0c9ec2fd9115017e693c91a630369