Restructuring

re-restructuring using blueprints for a larger app