Updated src structure