Adds Static Content & Refactors Architecture