Updated structure for local development