Simplified src structure
Updated web output