Updated base structure for common project