Refactoring current structure
Created single page machine mockup